xl: remove unimplemented -l stub for cpupool-list

Although advertised via the usage output, xl cpupool-list -l just
returns ERROR_NI, which does not show up on the console. Instead the
output is empty, which is not exactly what --long hints to.  To avoid
confusion remove the line from the help output and just ignore the -l
option properly until it gets finally implemented.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index eded63700eb1711ae9fc562f8ecafbda83edb1e4..f1917432cd335110280cff18218949c346d0fdab 100644 (file)
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -5439,13 +5439,11 @@ int main_cpupoollist(int argc, char **argv)
         return -ERROR_NOMEM;
     }
 
-    if (!opt_long) {
-        printf("%-19s", "Name");
-        if (opt_cpus)
-            printf("CPU list\n");
-        else
-            printf("CPUs   Sched     Active   Domain count\n");
-    }
+    printf("%-19s", "Name");
+    if (opt_cpus)
+        printf("CPU list\n");
+    else
+        printf("CPUs   Sched     Active   Domain count\n");
 
     for (p = 0; p < n_pools; p++) {
         if (!ret && (!pool || (poolinfo[p].poolid != poolid))) {
@@ -5453,9 +5451,6 @@ int main_cpupoollist(int argc, char **argv)
             if (!name) {
                 fprintf(stderr, "error getting cpupool info\n");
                 ret = -ERROR_NOMEM;
-            }
-            else if (opt_long) {
-                ret = -ERROR_NI;
             } else {
                 printf("%-19s", name);
                 free(name);

diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c
index 5e7793d49be963d23e06a0283ca101c78b3eaa3f..5083fc6d06c4a6ae2bd255b17f626b897ee8b50f 100644 (file)
--- a/tools/libxl/xl_cmdtable.c
+++ b/tools/libxl/xl_cmdtable.c
@@ -349,8 +349,7 @@ struct cmd_spec cmd_table[] = {
     { "cpupool-list",
       &main_cpupoollist,
       "List CPU pools on host",
-      "[-l|--long] [-c|--cpus] [<CPU Pool>]",
-      "-l, --long                     Output all CPU pool details.\n"
+      "[-c|--cpus] [<CPU Pool>]",
       "-c, --cpus                     Output list of CPUs used by a pool"
     },
     { "cpupool-destroy",